lavc/avcodec: fix global/private option precendence
authorAnton Khirnov <anton@khirnov.net>
Sun, 13 Oct 2024 12:11:39 +0000 (14:11 +0200)
committerSebastian Ramacher <sramacher@debian.org>
Sun, 27 Oct 2024 17:31:51 +0000 (18:31 +0100)
commit18da5fdc2bc2a933b0c439d2ec362985f603a2c8
treeb4cc783b1e4bbdd841b7dfe974c7523251474ccd
parent09758fcd26d8cc6ea80e59c5bbd5b7c5ba81880c
lavc/avcodec: fix global/private option precendence

Broken after 7753a9d62725d5bd8313e2d249acbe1c8af79ab1. Apply only the
whitelist early, and the rest with a single call to av_opt_set_dict2()
with AV_OPT_SEARCH_CHILDREN, which should be equivalent to the original
behaviour.

Reported-by: Cameron Gutman <aicommander@gmail.com>
(cherry picked from commit 9ce63e65d65b303813d4ae677228226d7cd232b9)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Gbp-Pq: Name 0013-lavc-avcodec-fix-global-private-option-precendence.patch
libavcodec/avcodec.c